Clean up man page handling

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 21863911c692ea2612ee89b997e1124b645b1e81..58235fd34343c9852f582935fe30fde1ee6240f2 100644 (file)
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -79,23 +79,38 @@ EXTRA_DIST += version.xml.in \
 
 ########################################################################
 
-if ENABLE_MAN
-
 man_MANS =                             \
        gdk-pixbuf-csource-3.0.1        \
        gdk-pixbuf-query-loaders-3.0.1
 
-%.1 : %.xml 
-       @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+if ENABLE_MAN
+
+.xml.1:
+       XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+dist-local-check-mans-enabled:
+       if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
+
+else
 
-BUILT_EXTRA_DIST = $(man_MANS)
+$(man_MANS):
+       echo Man generation disabled.  Creating dummy $@.  Configure with --enable-man to enable it.
+       echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild > $@
+
+
+dist-local-check-mans-enabled:
+       echo "*** --enable-man must be used in order to make dist"
+       false
 
 endif
 
-dist-hook-local: $(BUILT_EXTRA_DIST)
-       files='$(BUILT_EXTRA_DIST)';                            \
-       for f in $$files; do                                    \
-         if test -f $$f; then d=.; else d=$(srcdir); fi;       \
-         cp $$d/$$f $(distdir) || exit 1; done
+MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
+
+EXTRA_DIST += $(man_MANS)
+
+dist-hook-local: dist-local-check-mans-enabled gtk-docs-clean all-local
+
+gtk-docs-clean: clean
+       cd $(srcdir) && rm -rf xml html
 
 -include $(top_srcdir)/git.mk

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index ced81f0af84f6ba86d970dd28b1f8a752be25f14..a9ca65d370bb4473435996014497d34ba2dba396 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -382,7 +382,7 @@ else
 
 $(man_MANS):
        echo Man generation disabled.  Creating dummy $@.  Configure with --enable-man to enable it.
-       echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild Pango > $@
+       echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild > $@
 
 dist-local-check-mans-enabled:
        echo "*** --enable-man must be used in order to make dist"